Auto merge of #1339 - jakub-:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 23 Feb 2015 17:45:20 +0000 (17:45 +0000)
committerbors <bors@rust-lang.org>
Mon, 23 Feb 2015 17:45:20 +0000 (17:45 +0000)

Trivial merge